bitkeeper revision 1.1159.217.17 (41e80727RATVR7CCn-A5xanZXzrSfg)

Merge

diff --cc xen/arch/x86/domain.c
index 5d86fd34e5e149a0320b620530321032af6a7979,fa73e458eff2c1daf7a270c2fd2a65d0bd9f1b0e..c74d9b32c3af8d85d95472e979870c1efeb2eba6
--- 1/xen/arch/x86/domain.c
--- 2/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@@ -235,9 -227,7 +235,8 @@@ void arch_do_createdomain(struct exec_d
  
          d->shared_info = (void *)alloc_xenheap_page();
          memset(d->shared_info, 0, PAGE_SIZE);
-         d->shared_info->arch.mfn_to_pfn_start = 
-             virt_to_phys(&machine_to_phys_mapping[0])>>PAGE_SHIFT;
 +        ed->vcpu_info = &d->shared_info->vcpu_data[ed->eid];
+         d->shared_info->arch.mfn_to_pfn_start = m2p_start_mfn;
          SHARE_PFN_WITH_DOMAIN(virt_to_page(d->shared_info), d);
          machine_to_phys_mapping[virt_to_phys(d->shared_info) >> 
                                 PAGE_SHIFT] = INVALID_P2M_ENTRY;

diff --cc xen/arch/x86/memory.c
Simple merge

diff --cc xen/arch/x86/x86_32/mm.c
Simple merge

diff --cc xen/include/asm-x86/mm.h
index 283ad57a8f8e6cccebcdf41d89441aa9631a526b,a37f9f25448161a293e378ac7fcfe71a6caf101c..89ff350fe7fdf77f4001e8b01e3d33493a525991
--- 1/xen/include/asm-x86/mm.h
--- 2/xen/include/asm-x86/mm.h
+++ b/xen/include/asm-x86/mm.h
@@@ -215,19 -215,13 +215,22 @@@ void synchronise_pagetables(unsigned lo
   * contiguous (or near contiguous) physical memory.
   */
  #undef  machine_to_phys_mapping
 +
 +/*
 + * The phys_to_machine_mapping is the reversed mapping of MPT for full
 + * virtualization.
 + */
 +#undef  phys_to_machine_mapping
 +
  #ifdef __x86_64__
  extern unsigned long *machine_to_phys_mapping;
 +extern unsigned long *phys_to_machine_mapping;
  #else
+ /* Don't call virt_to_phys on this: it isn't direct mapped.  Using
+    m2p_start_mfn instead. */
  #define machine_to_phys_mapping ((unsigned long *)RDWR_MPT_VIRT_START)
+ extern unsigned long m2p_start_mfn;
 +#define phys_to_machine_mapping ((unsigned long *)PERDOMAIN_VIRT_START)
  #endif
  
  #define DEFAULT_GDT_ENTRIES     (LAST_RESERVED_GDT_ENTRY+1)